Align on 5.8, small cleanup + doc