LPS-38165 Retain original logic
LPS-38392 Fix my bad SF