cinnamon: sync it with the new commits.