Merge "Fix GetVersion2 bugs"