Merge branch 'ac-config-macro-dirs'