Sync with upstream: f359548f04e7397118327aed6e17283537762ae6