Merge latest changes from default branch to 0.3 branch.