Merge with 3.x.g.p