Rebase against new stable/grizzly changes