6.7.1-release
Merge branch '6.7.1' into stable