Removed ShortKey function
Merge remote-tracking branch 'origin/Code-Maintenance' into Script-Reduction