LPS-33269 & LPS-33085 Upgrade