Merging V3 branch
Version 3.4
Version 3.4.0 with packages
corrected conflict