Merge pull request #9221 from rkkoszewski/master