Merge branch 'mg/rev-list-count-cherry'