Sync with the changes pushed by Serge in the last merge window.