applied patch for multi-device bootchanges