fix unit test and run in processIsolation mode
Merge branch 'refs/heads/master' into 2.1