Sync from 21607b8
Sync from 49febb9
Sync from f5063ee
Sync from 44d846d
Sync from ff127fc
Sync from 7ef0be3
Sync from a7bb425
Sync from e66447b
Sync from 0203d10