report changes from marlin 0.5.4
report changes from marlin 0.5.4
fixed merge
fixed merge