Merge branch 'feature/macro' into develop.