Revert "Merge branch 'feat_controller' into 'development'"

Jan-Tarek Buttrequested to merge
revert-e3cab173 into development

This reverts merge request !26

Merge request reports