Issue #2228943 by Mark Carver: [REGRESSION] Template suggestions not being used.