A fix for BAU-1107
Merge remote-tracking branch 'origin/dev-BAU-181' into release/2.10.2rc