Merge: rev800 (Disable unreliable tests in staging until we can fix them reliably)
Merge: rev801 (u1 branded 2f)