fix build error in sss
Merge remote-tracking branch 'origin/release-14.10' into release-14.10