Merge branch '2.3-gae' into 2.3