fixes #2411 added ActiveSupport::Concerns to mixins and other code cleanups