V3.80~33 shelly devices switch around when adding new shelly's in the network

I have had a Shelly Pro4PM in my network for a while, in V3.70 I configured one of the ‘inputs’: channel 2 to be a heatpump. I left the other 3 shelly devices turned off.

I later upgraded to v3.80~33 and now added a new shelly S2PMG3 to my local network. At wich point my heatpump disappeared in the gx device and VRM and was replaced by my poolpump.

This is probably due to the dynamic behaviour of device id assignation?
To debug I enabled all shelly devices on the GX and now my heat pump is back, however I notice it has VRM instance 51, as well as one of the other Shelly devices:
channel 1 on the S2PMG3

So to paint the picture, I have 1 shelly pro 4 pm which has 4 energy meters and switches, and one S2PMG3 which has 2 energy meters and switches.

pro4pm - channel 0 = pro4pm - channel 0
pro4pm - channel 1 = vijverpomp
pro4pm - channel 2 = warmtepomp
pro4pm - channel 3 = vloerverwarming
S2PMG3 channel 0 = S2PMG3 channel 0
S2PMG3 channel 1 = S2PMG3 channel 1

and by adding S2PMG3 to the network warmtepomp was replaced by vijverpomp in my gx device’s device list.

There was a bug about the indexes fixed in 3.80~32.
That indeed may lead to the situation that a different channel or even a different shelly appears in venus after upgrading.

Once sorted again, it should not change anymore.