Merge "Fix slave cloning issue by binding Scanning rather than Searching /index" into stable-2.11