Merge branch 'develop' into bug/JAL-4289_group_boundary_not_drawn_properly_in_fastpai...