LPS-48391 - paths
LPS-48391 - macros
LPS-48391 - tests
LPS-48391 SF