Fixes to allow more instant generic use

Also added a link label for a "raw link".

Change-Id: Id69c1c626654af271bf07f4eb403df4b3fa45eec
Merge "Fixes to allow more instant generic use"