Above patch has some errors (size is too high), I have rebased the branch and...