Merge branch 'bug/JAL-2392_deadlockonpdbdisplay' into develop