Applying changes from DEPI infrasructure repo.