merge branch gh10 to 3.x