Merge branch 'patch/JAL-3874_newJmolAndGradleDedup' into develop