LPS-51724 - macros
LPS-51724 - tests
LPS-51746 - paths
LPS-51746 - macros
LPS-51746 - tests