merge r8212 into trunk