Revert "Revert "Merge remote-tracking branch 'upstream/dev-0.3' into dev-0.3""

This reverts commit b2f09feefb6615e3f3a07cb8948af35ed9f60791.