Revert "Merge branch 'devel' into feature/fingerbank"

This reverts commit e164c3df2ea24807d6928d10b355827e11454e98, reversing
changes made to 13b330f620cd2026533a8ba39a0997eb44c98a02.