PI1 BW migration fix (6422/2232 vs ZFR3/0231)