Merge "Return early from finishIfDone if not done" into main