Merge branch 'vdr-next' into next