Merged with gae-init