5.4-dev
Merge branch '4.4-dev' into upmerge
[5.4] Plugin and events: extend deprecation to 7 (#45818)