Feature Definition for https://www.pivotaltracker.com/epic/show/848898