Sync from 8f1247c
Sync from a23c249
Sync from ff127fc
Sync from 7ef0be3
Sync from a7bb425
Sync from d9c8ebd
Sync from 0203d10