Development shortcut ~> Development shortcuts

Change-Id: I803c67abd82d634d27d40107fa5acec934465e67