Merge branch 'bug/JAL-2283consColourEnabled' into develop