Merge branch 'feature/JAL-2422ChimeraX' into develop