Merge "Move EnhancedEstimates to PowerModule" into tm-dev