Adopt changes from gf branch