Update to RS v13.5 template tools