Use ActiveSupport::Concern instead of the traditinal way
Merge pull request #16682 from untidy-hair/use_activesupport_concern

Use ActiveSupport::Concern