Chore for 5.8 (#1198)