Imported updates from SD project.