LPS-36072
LPS-36077 - paths
LPS-36077 - paths