Update guards/extensions #15635
BackI didnt update guards in payment module, cause i dont know how to test
I didnt update guards in payment module, cause i dont know how to test