LPS-39248 - paths
LPS-39248 - macros
LPS-39248 - tests
LPS-39248 SF
LPS-45028 - paths
LPS-45028 - macros
LPS-45028 - tests
LPS-45028 SF