Add missing files from merge with master