Merge pull request #33284 from mlaventure/17.03.2-cherry-picks

17.03.2 cherry picks