Merge "fix sed command in macros"