Feature/71051720 highlight

PR made for review
Would this test need to be completed?