Merge branch 'bugs/JAL-2779_osx_dialogsequencingbroke' into develop