publish: Merge branch 'hotfix/0.2.1' into develop

generated from commit 1fcdc690f2a8c5f8c3853ddb41d0768de3a6a466