Merge units into main

Merge the units branch into main, after fixing merge conflict in units

assigned to @frederik-alexander.keens

added 55 commits

• 5400f688...b58dcb12 - 54 commits from branch main
• 9834ecf8 - Merge branch 'main' into 'units'

Compare with previous version

mentioned in commit fd94bc7a

merged