LPS-51514 - paths
LPS-51514 - macros
LPS-51514 - tests
LPS-51514 SF