updated to stable/grizzly branch