Rebasing marshal.c

Reported