Comment 3 for bug 1558486

I could not duplicate this but I think I figured out where the issue was and committed a fix for it in the product branch r6675. Please test this and let me know if the assertion is resolved.