default action no longer needed, it even breaks the site
Merge branch 'master' into 2.2

* master:
  default action no longer needed, it even breaks the site