Merge branch 'expose-dialog' into develop
Merge branch 'white-space-fixes' into develop