Merge "Add missed finish() call"