Patch failed on 8.x-1.x-dev branch. Hence re-rolling patch.