Merge pull request #8097 from brunompena/package-tac_plus