B1070

B1070: Diff 1710