Merge commit '95315b87df02e5f6eea972920533fb56d5547ca8' * commit '95315b87df02e5f6eea972920533fb56d5547ca8': Add GlobalSearch to test definitions.
Merge commit '95315b87df02e5f6eea972920533fb56d5547ca8' * commit '95315b87df02e5f6eea972920533fb56d5547ca8': Add GlobalSearch to test definitions.