Import of Version 3.5.0