Merge branch 'feature/ActiveRecord-support' into develop