B1188

B1188: Diff 1885