update to stable/grizzly