Added poc/0.6 branch.