Final improvements before the release 3.2.3