Sync from 00848b25447219321024e9ed59ecfaa878aff44a
Sync from 8b6635bf3de9715795cfb37bb5c824882ef3ef9b
Sync from 139eb73b3a32cdafa0cce4ea78dc2f58c19c9e1a