Sync from 723ef6f
Sync from 9d78faa
Sync from eee2e0f
Sync from a6bdea7
Sync from 55da490
Sync from 2f4e576