Modify templates for ink framework
Added tag INK Port for changeset 21e75b68fd6c
Merge with github master