LPS-36633 Fix additional startup errors caused by LPS-36639 and LPS-36706
LPS-36218 S/F fix