[R43] Upgrade patches. Fix bug