Merge "Add optional additional entropy to finish" into mnc-dev