active record autocomplete fix
Merge branch 'origin/dev'