LPS-50785 (fix for LPS-50502) - Autogenerated