New devops updates
Merge remote-tracking branch 'origin/devops' into devops