Merge branch 'features/JAL-1933_occupancy' into features/JAL-2295setChimeraAttributes