Merge branch 'heads/dt-for-v4.7' into devel