Merge branch 'bug/JAL-2386groupConservationColouring' into develop