Perform a code sync with the CNCF codebase to bring the latest updates across #96

Closed cjyabraham closed 3 years ago