Merge for v0.2-alpha

This pull request merges changes from the `v0.2-alpha` branch into the `release` branch.