Merge commit 'origin/porter-0.7.1'