Removed unused code
Use the same keyword
Merge branch 'master' into listening-components
Prepared for expanded index types
Merge branch 'master' into listening-components
Increased batch size for reindexing
Increased batch size for meta index rebuild
Merge branch 'listening-components'