LPS-48564 Fix regression caused by LPS-48099
LPS-48894 SF