Merge branch 'ds/feature-macros'