remove use of context when doing initial marshalling, add test case for pad.lv/1301723