Update macros
Merge