sync to release of 5.0-rc3