Import of Version 2.5.18