Rename ADD_.._IF_POSSIBLE macros to avoid conflict
Rename ADD_.._IF_POSSIBLE macros to avoid conflict

bluerover/6lbr,bluerover/6lbr,bluerover/6lbr,bluerover/6lbr,bluerover/6lbr,bluerover/6lbr,bluerover/6lbr