Merge branch 'bp/rename-test-env-var'