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