Add patched version to avoid warns in watchdog
Merge branch 'origin/7.x-1.x'