Fix for failing tests in marquee branch