LPS-39969
LPS-40391 - paths
LPS-40391 - macros
LPS-40391 - tests