Merge "Use DB field sizes instead of _MAX_LEN constants"