LPS-32158

LPS-32158 - Work ongoing