(#58286292) Fill up by content  Group table

https://www.pivotaltracker.com/s/projects/927566/stories/58286292