Merge remote-tracking branch 'ubitux/shorthand-cleanup'