LPS-49280

This is in junction with commits for AUI-1550