Merge "Improve ShortcutSrvice" into nyc-dev