Revert "Merge branch 'feature-UI_integration-from-adhoc' into 'development-encoding'" See merge request !43
