Change Details

backport of first commit (50b6533) from PR13106 Note from Mark -- Matt missed renaming in a couple of comments--fixed. Depends on D2904

backport of first commit (50b6533) from PR13106 Note from Mark -- Matt missed renaming in a couple of comments--fixed => backport of core PR13154. Depends on D2904

backport of first commit (50b6533) from PR13106 Note from Mark -- Matt missed renaming in a couple of comments--fixed => backport of core PR13154. Depends on D2904