Merge "Fix release version" into honolulu