[#79323508] PR fixes
Merge branch 'assignments-b-gone' of github.com:Tahi-project/tahi into assignments-b-gone