Update main-app to 4.0