Merge pull request #9367 from codesparkle/master