Merge "correct the setenv option judging condition"