Upgrade root project to 2.3.5