catch up with upstream
Patch descriptions changed