Merge remote-tracking branch 'origin/env_fault'
v1.6.5
changelog
Merge remote-tracking branch 'origin/master' into env_fault