Applying changes from DEPI infrastructure repo.