LPS-39188 SF (make this consistent with SF)