Merge branch 'release/v0.4.34' into develop
two minor bug fixes
Merge branch 'release/v0.4.35'