Import post-patch from gusi.