PKMDS: switched to ncorgan/compat_cleanup branch