Merge branch 'hotfix/view_become_local_fix' into dev
guides mocked
no message
no message
no message
Merge branch 'release/0.4'