Merge branch 'features/JAL-2295setChimeraAttributes' into spikes/mungo