Merge branch 'JAL-980_jmol_patch' into develop