AUI-749 - Autogenerated