Merge branch 'bug/JAL-3244jmolWindows' into develop