Merge branch 'topic/pcm-params' into for-next