Merge branch 'ab/make-cleanup'