CB-5793 Backport this doc to 3.4.0

Backport this doc change to 3.4.0 since this is where the new behavior
appeared.