Merge branch 'bp/remote-mw-tests'