Applied plugin bag rename patch

Conflicts:
	tests/src/Unit/BlockDisplayVariantTest.php