Merge branch 'development/profiledialog'