Merging dev-1.7.10 >> master part 2