Merging changes from 1.10
Merging changes from 1.10
Merge with 1.10