More test to avoid errors when env is not complete.
Merge remote-tracking branch 'origin/3.3' into 3.3_backported