Merge branch 'pipeline' into mia