Re-rolling patch again as it was not getting applied after recent test case c...