final sync for aug 1
Merge remote-tracking branch 'origin/tal' into jeff