KCINFR-979: S2s pd unit api