Latest sources from upstream, disable Patch28 and updated Patch25