Merge "Use option to flush the entire buffer on -EOVERFLOW" into oc-dev