Import of Version 3.6.0