Trying to fix dialogbox error
Merge branch 'master' into dev