Sync from f46f8f9
Sync from a6bdea7
Sync from 75efa76
Sync from 55da490
Sync from be0a72d
Sync from 2f4e576