Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
Default image issue resolved in resource search
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
Merge pull request #105 from mitraj/release-6.2

Default image issue resolved in resource search