Merge pull request #10371 from MiyaNoctem/CRM-20594-optimize-relationship-count