Devseed merge

Not all files were merged in previous pull.