LPS-42926

This needs to get into 6.2