Merge "Add fixes for Ring buffer size changes"