MERGING LATEST MARLIN CHANGES