Merge branch 'hotfix/0.7.9.3'
Merge remote-tracking branch 'upstream/master' into develop