Feature TDI-29250 improved:fix three small bugs.