LPS-51693 SF

cc @brandizzi