Merge "Fix bug in equals implementation for search headers" into sc-dev