Merge branch 'devops' into portrait