Merge branch 'master' into admin/stop_support_for_rails_6