Merge: rev772 (edit account up to spec u1 brand)