stack-cd related fixes
Merge branch 'master' of github.com:miohtama/ztanesh