Merge branch 'bug/JAL-2589gapColour' into feature/2588