Merge "Add optional additional entropy to finish"