Update changes file
Fix reindex logic
Merge branch 'master' into jmu-production