Merge branch 'Indore-2017.2.x'