Merge "Rename Flush to Finalize"