Commit 3.2 final