After several hours of debugging, the problem should be 
fixed now. I have tested various cases and it seems okay 
now in the 3.30-RC6.

Can you check if you can?