Merge "Reinsert macro to fix issue 884."