Release 3.2.1

Bug fix release 3.2.1

Change-Id: I481c4c9bcfa7edd5b4650d624dc58e9a1deb602f