Imported updates from other branches of the main repository.