Master --> develop (hotfix + 0.34.1)