Merge branch 'fixes-v3.2-rc2' into fixes