[R43] Upgrade patches. Fix bug
Merge remote-tracking branch 'origin/coron-4.2' into coron-4.0