Final commit for v2.0.2b