fix 12277

BS3 commits: d8c87ddc285c598f09cb70e2244d7cef5a8e5bad