Import of Version 1.7.1