Merge branch 'jc/remove-export-from-config-mak-in'