Merge "Clarify ambiguities in securityAlgorithmsUpdated." into main