Merge branch 'ensure-clean-env' into develop