Merge branch 'Indore-2017.1.x'