Revert "Merge branch 'develop' into feature/doftable"

This reverts commit d4f836f8a1aa3ed7fca04960a3063a40e3fe10d4, reversing
changes made to 24aef4ffbcb73381d48f1d17c219d00a96e4658b.