Merge pull request #11778 from h4ck3rm1k3/master