[COMMIT] fixes for pcm-5823