Import of Version 2.7.0