Almost all per-fk templates are working again. refs #512