merge new donut version into open-source variant