Feature/shortcuts

Merged Agate requested to merge feature/shortcuts into develop

Merge request reports