Cherry-pick c6cf2fe into experimental