cherry-pick: regression fix for empty commits