Sync from 723ef6f
Sync from eee2e0f
Sync from a6bdea7
Sync from 9f1420d
Sync from 2f4e576
Sync from fdbfdc8