Merge branch 'main' into crend_refactoring_leftovers_cleanup