LPS-46814 - paths
LPS-46814 - macros
LPS-46814 - tests
LPS-46811 - paths
LPS-46811 - macros
LPS-46811 - tests
LPS-46811 SF
LPS-46665 - tests