PLA-669 restorin old tamplate, with click tracking change
PLA-669 fix for broken layout for exact match
Merge branch 'PLA-669' into dev