Applied patch to fix regression tests