Merge branch 'case-3211' into develop
Case 3209 - Minor speed optimizations.
Merge branch 'case-3209' into develop

* case-3209:
  Case 3209 - Minor speed optimizations.
Case 3208 - Added full relations to search request.
Merge branch 'case-3208' into develop

* case-3208:
  Case 3208 - Added full relations to search request.
Merge branch 'develop'