[FORWARD PORT] LPS-51592 LPS-50329 upgrade process