Merge branch 'topic/dmam' into for-linus