Fix 7398 in Basic template
Fix 7398 in Basic template

BS3 commits: 88b651012d5ccefde2088010134079c8eccc6051

ztx1491/todc-bootstrap,2947721120/todc-bootstrap,up2vs/todc-bootstrap,todc/todc-bootstrap,mozillo/todc-bootstrap,todc/todc-bootstrap,2947721120/googlebt4,aaroncnhk/todc-bootstrap,todc/todc-bootstrap