Merge branch 'topic/aoa' into for-linus