Import of Version 1.9.4