Sync from 2f9d26a
Sync from a5fec74
Sync from 497e6f9
Sync from c4fcb6f
Sync from 3cfab38
Sync from b87ad55