Merge "Clarify securityAlgorithmsUpdated and add new null enums" into main