Merge branch 'bug/JAL-2517cancelAppletColour' into develop