Merge branch 'release/0.3.4' into develop
Temp change to user schema
Bump to 0.3.5
Merge branch 'release/0.3.5'