Remove tax id from generic customer
Merge branch 'develop-final-customer-fix' into develop