Import of Version 0.9.16