Added feature requests and bug fixes.
Merge pull request #10346 from TimOliver/master

Added feature requests and bug fixes.