Merge branch 'bug/JAL-3218scalePanelPopups' into develop