Update manifest files for marlin branch