ticket:1 template fix. test fix
Merge remote-tracking branch 'origin/t1_contact'