20210605 city.hyderabad: Resolve issues related to Dharani