I have finally found time to finish OS12212156 xdf work. The XDF is added to the first post.
This time it's rather thoroughly tested so it should be safe to use. Please let me know of any issues you may find.