Merge branch 'feature/JAL-3551Pymol' into feature/JAL-2422ChimeraX