Manual merge of UpdateManager fixes