Import of Version 1.4.18