Fix 11594

BS3 commits: cad664e863b50bceb5d8cc310de1ff301191422f