Case 3453 - Fixed issues when opensearch does not find object.
Merge remote-tracking branch 'origin/case-3453' into new-search