TDQ-9218 babili manual commit

merge on master.