doc change: cherry pick c87f7a658ea586a5271fabc6e0516a2ddf6f from master
16 files changed