Merge branch 'topic/pcxhr' into for-linus