#23898 - Relaxed template requirements to allow arbitrary fields to be
used in templates