fix 10692

BS3 commits: 4e962c572e57ff0ee30e490f3f7eb819415c952f