Prevent load options from being passed to ElasticSearch
Merge branch 'ignore-load-param'
Update deprecated ActiveRecord includes syntax
Merge branch 'includes'