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