CRM-13497 - getting there on main tables