My cherry-picked commit