~ merged back 2.2.1-frima thread-safe pubsub