fix tdq-111 msjian
Merge branch 'TDQ-111'