Merge branch 'master' into improve-pipeline-design