Merge branch 'hotfix-1.8.5'
Add searchcloud_block to make file.
Merge branch 'hotfix-1.8.6' into develop