Bug#0 change 6821/7710 branch into v1.3t