Merge commit 'origin/0.7' into 0.7