TDI-12345 commit