WPRO no longer a submodule, merged from master