Revert "Merge branch 'bugs-3089' into 'develop'"

See merge request cellframe/cellframe-dashboard!111