Merged with web-ui-plugin-support