Stable/grizzly

Include latest fixes into stable/grizzly