Merge branch 'bug/JAL-3818_jmolDeadlock' into releases/Release_2_11_1_Branch