Release #5636: Move plugin-x to external