Merge "Add support for WV plugin"