fix 10732

BS3 commits: 607b802d2fe8bcf536198d44dd1914212d3b208d