LPS-51215 Fix compile error
LPS-51068 SF