Feature #5006: Upgrade plugin-x