Import of Version 3.2.0