Move the search service implementations from the portal.
Merge remote-tracking branch 'origin/develop' into develop