Import of Version 3.9.0