Merge: rev754 (U1 brand specific form fields)