Sync up security/extensions
feature branch with main on 06/13/2023
#2854
+31,902
−23,431
security/extensions
feature branch with main on 06/13/2023
#2854