Import of Version 3.3.0