Merge "Fix a bug in GVN."