Merge "Check for dynamic summaries at display time for search" into oc-dev