Private fork of ddskk-15.2