Initially for HL7AT JT 2023, will be changed for upcomming HL7AT JT
(cherry picked from commit da693ded)