Merge 3.0 into WG6 branch