sync to ksuwdc master