Restore more changes from merge