CON-1140: Trim fields