Rebase from 'upstream'
Integrate patch file used in dry version.