Merge commit 'v3.2.9' into rt-3.2.9-rt13