Comment 16 for bug 1985057

I've added some testcases to the description now and reviewed the recent changes. While we could probably cherrypick more fixes the current set is enough to fix the issue and isn't needed extra fixup commit by itself, so we would prefer to keep the change to minimal and go with that set