Follow the idea of rP19095.
Sure the chariot come from nowhere, ...
It's not something which is my deep desire, so add a request and I will adress it. (Even a "no" is ok). But don't start eternal discussion.
It's mainly a diff to test bugs of the upgrade feature.
(I don't adress file namming in that diff).
Needs D960.