Re #9919 Moved D17 data to the usage folder.