Last cherry-picked git revision:
d5691462d89327479c70ac7ba70456ce2ec11f4b
