Circular buffer read cleanup from Build #38 (work on PASDK-53).