don't put id in template
removed builder body res id
Merge remote-tracking branch 'origin/qa' into qa