DE685 - making UI match the validations on schema.
Merge remote-tracking branch 'origin/integration' into integration