Added patch in 8.x-1.x branch also.