Merge branch 'gh/dist-clean'