fix marketplace

master  -> merge
v1-train -> not tested