Merge branch 'heads/dt-fixes-for-v4.5' into next