Import of Version 0.16.4