Cherrypick del commit 4b57ae28e2f35e8a6773a5a89723c581776c4370