Bring main and devel back in sync

This branch is a copy of main. Removing two problematic merge requests from main made it possible to merge devel back into this branch. Now merging this branch into main.

Main changes wrt to what's currently in main is the requirement on formatting: !191 (closed) In that MR, there are instructions on how to apply the code formatting rules to code that fails the CI because of format_checks.