Feature/71051720 highlight

PR made for review