Merge pull request #403 from the-hideout/combined-prs-branch

Merge pull request #403 from the-hideout/combined-prs-branch #729