Merge latest changes from default branch into 0.2 branch.