Import of Version 3.1.7