A potential fix for BAU-92
Merge remote-tracking branch 'origin/dev-BAU-92' into release/2.9.16rc
Putting together ambra rc 2.9.16 comprising only the fix for bau-92