[NGRINDER-588] Fix the missing changes.