Updated: Moved template to more descriptive location. Ticket #13908