Final commit for 5.8.0 (#1205)