CDB-1957 Reactivated and adapted spec to capture this
Merge CDB-1957 into release/2.11.0