Issue #3331059 by quietone, Wongjn, ameymudras, smustgrave, xjm, alexpott,...
Issue #3331059 by quietone, Wongjn, ameymudras, smustgrave, xjm, alexpott, larowlan: Properly check for block content type in BlockPluginId process plugin
(cherry picked from commit 49ecf1d7)