Merge branch 'topic/oxygen' into for-linus