fix 11378

BS3 commits: c84d96ac1fa6af162fdb069eec9cf5a426692677