Merge branch 'warnings-as-errors' into 'develop'