LPS-49773 [NO LOGIC CHANGES] Auto SF

@cgoncas, @sergiogonzalez