LPS-41769 - paths
LPS-41769 - macros
LPS-41769 - tests
LPS-41769 SF