Documentation updates related to SPR-11703

If it is fine, please merge it with master and 4.0.x branch.