DE613 - Fix max length field
Merge branch 'integration' into integration-work