LPS-37345 fix jspc
LPS-51315 SF