Rebasing marshal.c

Noted