Charts: Updated to the latest v4.0 core code