LPS-46731 - paths
LPS-46731 - macros
LPS-46731 - tests
LPS-46731 SF
LPS-46773 - tests