Merged latest marlin branch