Sync with 'upstream/master' ID 890a575667acf75f24dd0c686c395f6f18b4e698