LPS-49233 Move it out, so you can call the macrodef
LPS-49233 fix broken build
LPS-49233 SF