Merge pull request #12335 from pivanov/bug-906830