Upgraded bundled-plugins to 3.9.0-alpha-21