Merge branch 'release/0.4'
Fix to avoid warnings
Merge branch 'hotfix/warnings' into dev