shortcuts. Create, edit or move into another group
Merge branch 'master2__create_shortcuts' into master2