Merge branch 'merges/develop_JAL2295setChimeraAttributes' into develop