use macros
Refs #20358
Merge branch 'reportek_utilities_20358' of https://github.com/eea/Products.Reportek into reportek_utilities_20358