Merge "Adding support to parse deep-shortcuts." into tm-dev