Patches for Grizzly/Nova not yet merged to the stable branch