Merge branch 'dipm-fix' into upstream-fixes