TDQ-8787 TDQ-9141 fix lost parts with conflicts between 8787 and 9141