[atrt2] Update to Template 12-17, 35&