Now setting the finalized flag before doing finalization to prevent possbile reentrancy issues. (#1447)


(cherry picked from commit 5bb86521)