Added processing of `nil` to `highlight` helper method
Merge pull request #17113 from igor04/helpers-highlight

Added processing of `nil` to `highlight` helper method