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