Merge branch 'fixes-v5.7' into fixes