Merge branch 'master' into lp-1336843-wo-jenv-destroy-env