Sync 10.7 with 10.4
Add files missing from 10.4 from 10.7