ref: refs/heads/fix-pcm-api-regression
