Merge down dynamo patch from release-y