*8274* Added missing template
*8277* Added handler