Merge branch 'fix/pcm-jiffies-check' into topic/pcm-jiffies-check