Merge branch 'hotfix/subscribe_sender'
kwargs
Merge branch 'hotfix/kwargs' into develop