Fixed T2/T2 upgrades for B257
Merge remote-tracking branch 'upstream/master'