Sync with the latest Marlin release