Fix include case
Merge branch 'release/1.10.7'