Merge branch 'Indore-10.0.x' into Indore-2017.1.x