Final commit for v4.0