Local modifications to branch 3.3.2 merged