Re #10213 Better D17 description, updated loader