Merge "Fix update logic for multi backend"