US#84682 Rewrite Template mashup for basic support new Steps Success