Merge "Clarify Secretkeeper comments" into main