Merge branch 'rel-1.8.11.0'