Merge with latest version from Gogo