Merge "Update to RC2 versions" into honolulu