Rebase to v0.20.3
Update patch file
Rebase to v0.20.3[D