Sync from ef089ce
Sync from 75e7c4c
Sync from 6d100dc
Sync from 37d71d9
Sync from 74db128
Sync from b146cbb