check in changes for grizzly server