Merging back of r2d2-b