#101 Rewrite shortcuts before init
Merge branch 'issue-101' into rc-1.10.3