Merge branch 'jk/common-make-variables-export-safety'