merge Lemaker 3.4 dev