Added missing files from merge issue.