LPS-36441 - paths
LPS-36441 - macros
LPS-40339