Merging from 1.7.10 version