Sync from b636781
Sync from ac0103d
Sync from eee2e0f
Sync from a6bdea7
Sync from b0088c5
Sync from 55da490
Sync from 2f6442c
Sync from b9d7956
Sync from 80efc57
Sync from 2f4e576
Sync from fdbfdc8