Please recreate the issue with debug logging on and attach the debug log here:
We haven't been able to recreate such an issue in our tests. We also haven't noticed anything like this being required: