Merge branch 'main' into 2.x

* main:
  Increasing priority of pass to remove before Twig tries to use it
  Fix incorrect classes assignation and controller rendering

Author: weaverryan