MBS-4094: move macros to macros file, name more appropriately