Merge branch 'development-0.4'