Changes merged from test-env-release