Merge branch 'jn/make-assembly-in-right-directory' into maint