Merge commit 'v3.4-rc3' into rt-3.4-rc3-rt4