Merge remote-tracking branch 'origin/0.4.x'