Fix for missing indexes
Merge branch 'origin/dev'