Add support for macros

Merged Michael Sammler requested to merge ci/macros into master

Merge request reports