Final commit for v2.0.3a