[upstream] Minor updates