Grunt after merging #12863