Bugfix/2d controls

Merged Julius Nehring-Wirxel requested to merge bugfix/2d-controls into develop

Merge request reports