LPS-34047 - Macros
LPS-34047 - Tests