Merge branch 'patch/JAL-3921_jmol_session_save' into develop