Update patches from hydro release branch
Updated patches.conf