Synchronizing changes from folsom to Grizzly