LPS-39665 Upgrade