Nova Grizzly changes which have not yet merged