Thanks for confirmation. So we still need to work on the proper fix. This has to be discussed with the upstream again. Meanwhile we can keep the downstream fix patch for now; it's pretty safe and has been working.