Merge branch 'features/JAL-2320_closeChimeraAction' into develop