Make sure we are using shade for deliverables
Merge remote-tracking branch 'origin/code-clean-up'