Merge open-source donut back into internal tree

Merge commit '4cf03d381b2dff908857fceff0bec445f8d44f36' into HEAD