ICSHWI-8457: Housekeeping

requested review from @gabrielfedel

assigned to @anderslindh1

Hi @gabrielfedel ,

This MR now has conflicts with master - ping me if you want me to rebase before a merge.

added 4 commits

• 207b91a8...f410c9ac - 3 commits from branch master
• 4741a7b0 - Merge branch 'master' into 'icshwi-8457_housekeeping'

Compare with previous version

mentioned in commit e73a61c5

merged