encoding
Merge branch '6.8.1'