Merge commit 'bf23fe062ab4321143717c21827d329e087cc72f' * commit 'bf23fe062ab4321143717c21827d329e087cc72f': Prepare SearchManager framework for adding Genie logging.
Merge commit 'bf23fe062ab4321143717c21827d329e087cc72f' * commit 'bf23fe062ab4321143717c21827d329e087cc72f': Prepare SearchManager framework for adding Genie logging.