Merge: rev747 (new account view u1 branded)