6.1.2
Merge branch '5.4-dev' into 6.1/maint/upmerge-260619
[6.1] Lazyload all plugins except compat plugin (#46862)