LPS-37730 - paths
LPS-37730 - macro
LPS-37730 - tests
LPS-37730 SF
LPS-39514 - paths
LPS-39514 - macros
LPS-39514 - tests
LPS-39514 SF