Merge branch '2.3-gae'