TDI-29925 : improve repeatable action.