I also want to add that CPANEL-31558 is marked as resolved in v86.0.9 of cPanel & WHM which was pushed out yesterday.