fix 13427

BS3 commits: d42b1a2d2d0911de918bcd7ec37c7bd3568a18f3