MT#8401 Invoce data preprocessing.

(cherry picked from commit c43ccd7c5d003916ef2f0934ba8375e6b35bccd5)