Merge pull request #6660 from MrPetovan/task/6552-frio-improve-thread-display