Merged 1.2 into main branch. Bumped to 0.6