fix 13697

BS3 commits: ad34c3b061b1b565dc087dfb8679292cf8e828d4