Redmine#6674 cherries