Revised v2 template resource and endpoints. bugid:112489