Re-Rolling Patch, As #4 is not working for 7.x-3.x branch with Tag -> 7.x-...