KFSUPGRADE-999 working on DDservice