5.4-dev
[5.4] Remove use of deprecated dispatcher from the plugin constructors (#45644)
[5.4] Correct subpackage (#48181)