Cherry-picked from 1a722edfce6234319c5eaecf3cd0076fa9690267 Co-authored-by: Marcus Sorensen <mls@apple.com>