Revert "Merge branch 'hackathon2022' into 'next'"

This reverts merge request !1516 (merged)

Contains code-changes that are too experimental/preliminary for next branch.