Merge branch 'amf/pubsub_send' into sprint54