US#84682 Rewrite Template mashup for basic support new Steps Success
Merge pull request #82 from roadhump/feature/us84682

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