CC-187 and CC-181 order of columns in search result
Merge commit '48727391d01447a6e05ba4d281663f36f6521bc9' into HEAD