d9fc484
Auto-sync with upstream branch release/2.25/master Upstream commia:t 864ea5f6579edfee41f7d4a778807045b5aff66b