TEMS-43 first commit