AMEC-1864 fixing a policy error
Merge remote-tracking branch 'origin/dev-corrections' into release/2.9.7rc