Redmine#6779 cherries