Merge "Fix copy/zero macros." into nextgenv2