karthik | done TAMA improvements under MS547 ticket