Looks like the merged PR was lost from master before 5.0 was cut and only gets noticed now. Will be addressed as part of HHH-10124