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