[Epics-india] Design review feedback