Hello,

Attaching patches below.