[FORWARD-PORT] LPS-51735 autogenerated