Import of Version 3.7.0