LPS-41407

For master.

This bug fix needs to be backported to the release branch.