Merge commit 'v3.2.1' into rt-3.2.1-rt9