Sweeping !21010 from 21.3 to master. Small fix in NSW validation alg + update macros
Small fix in NSW validation alg + update macros
See merge request !21010 (merged)
Small fix in NSW validation alg + update macros
See merge request !21010 (merged)