Final fix to media items search index
Merge branch 'refs/heads/release'