future changes to appengine stage (not master)