Merge branch 'fixes-dt' into fixes