Merge branch 'fixes-dra7' into fixes