- Final commit for 0.6