Merge branch 'fixes-rc2' into fixes