LPS-40522

Can you make sure this doesn't break your changes in LPS-35606