AI-672 - Enum values do not appear in web form
Merge remote-tracking branch 'origin/production3' into production3