Sync up with the commit 4993f1860951dbbdf964c9a940934eedc17ff290 of the base