Merge branch 'rewrite-update_engine' into merge-update_engine