Merge branch 'topic/azt3328' into for-linus