LPS-36245 - paths
LPS-36245 - macros
LPS-36245 - tests
LPS-36245 SF