SNMP varbinds changed order in 2022.4

Has anyone else found that the snmp varbinds used in creating alert messages have incremented by 1? I can certainly go and 'fix' it, however one of the alerts was in varbind 10 and fixing it would mean using varbind 11 which doesn't exist. This has completely broken the tool for us. Did I miss something? Here is an example of how we are formatting alert messages for snmp traps:

${N=OLM.AlertingMacros;M=OLMAlertMessage.VbData10}

(Apologies for cross posting this.  I wasn't sure if my original post in LA was appropriate)