LPS-51463

Just realized the ticket is part of a bug fix that already has been backported.

Can you change my commit messages to either Shuyang's or LPS-51565.

I would do it but I don't want to trigger another test build.