I have a new fix which fixes all the cases in SI-6680 as well.