Merge pull request #12187 from pivanov/bug-911968