LPS-51313 SF
LPS-51496 - macros
LPS-51496 - tests
LPS-51496 SF