Merge branch 'for-3.5/dt' into for-3.5/dt2-new