Merge "Remove EnhancedEstimates isHybird flag from trigger condition" into tm-dev