Search all UI sites by default
Merge branch 'refs/heads/master' into test