Merge commit 'v3.2.15' into rt-3.2.15-rt24