Sync from 2483833707c2cc715409ad00fe590d2a70a46757
Sync from f5e80b09083fe4dd89fdf85365ad1a99980765cf