Merge pull request #1914 from christav/dev

Updated for deploymentslot error