fix 11144

BS3 commits: 25b7a5200d396145943f5b651792b868a95c663a