This change is preparation for fiber support.
Perfect! Thanks! Testing and submitting.
Submitted in 353805.