Merge pull request #822 from NeoRaider/staging-dir-host