Merge branch 'master' into develop
dialog bug fix