Merge "Rework op macros"