Merge branch 'upstream' (Lucid->Precise transition)