Merge branch 'develop' into feature/user-guide-cleanup