Support for 10.5x

Merge branch 10.5x to master.