r10072: new macros