Import of Version 3.4.0