Merge commit 'upstream/0.4b43'