Revert "Revert "Sync with original""

This reverts commit b6bee8633f50f335cf81ce0ed8bc57cab2ba0a64.