Added 26570
Fixes to last nights regression tests