Merge branch 'bug/JAL-3120restoreFeatureColour' into merge/JAL-3120