Merge "Dedupe credential options" into main