merge with gae-init