Import of Version 2.10.0