Handle relocation of templated version

Change-Id: Ied4e35f59dbdfe3ad5d2db7357d07ba4f247a049