Merge branch 'impl-13342'; Closes 13342.

BS3 commits: e44f5b15b1330b00f62eb8bf5dc923b31f869995