fix and update for release-3.2.0.1