Pre QA commit for Tokyo template