Merge branch 'release/v0.4.29' into develop
causes errors on vm
fixed up user overview & detail
Merge branch 'release/v0.4.30'