Final commit for 0.5.3.5