Minimal changes for 5.8.0