LPS-36480 Upgrade for change made in LPS-35062