Hi Ishai, In general this seems like a good idea, but I think we need a fall-back position, since we can't assume that all deployed SMs will be upgraded immediately. - R.