Merge "Add flush test" into oc-mr1-dev