Merge pull request #3001 from Bubbles-IT/8.0-fix-pos-tax-label