Merge: rev818 (u1 branded readonly mode)