Allow searching on versions
Merge branch 'version-5.0' into 5.0-index