Sanne Grinovero as mentioned on HSEARCH-2616 Pull Request Sent , I ended up implementing failure recovery without this hidden field in a reliable, though sub-optimal way. Let's see how it goes and put this ticket in stand-by mode for now.