Sadly we still have to apply this workaround as the issue doesn’t seem to be fully fixed yet.