Merge branch 'bug/JAL-2589gapColour' into develop