Import of Version 1.10.1