[HFIX] Fix ND and tax domain

Merged Diego Barreto requested to merge HFIX into 12.0
  1. Oct 18, 2024