Fixed pickle definition
Merge branch 'generate_constructors_and_modules' into for_third_party