Merge branch 'topic/cs423x-merge' into for-linus