WL-2627

WL-2628 has been merged into WL-2627