Re #10532 updated SNS code (not if anybody uses it anyway)