Merge commit '506dd3fc137df3f002a58ee2edb5b393e1f365cf' * commit '506dd3fc137df3f002a58ee2edb5b393e1f365cf': Initialize searchmanager on demand
Merge commit '506dd3fc137df3f002a58ee2edb5b393e1f365cf' * commit '506dd3fc137df3f002a58ee2edb5b393e1f365cf': Initialize searchmanager on demand