fix devhub regressions (bugs 847326, 847296, 847317)
Merge pull request #651 from muffinresearch/fix-missing-z

fix devhub regressions (bugs 847326, 847296, 847317)