Merge branch 'fixes-rc1' into fixes