Carried forward from #1303 to get better tracking for major features/changes. fyi @vic-topcoder @sachin-maheshwari