chore: merge develop into version-3-hotfix
#1067
+5,096
−3,874
Merged