LPS-38632 Combine to one operation to prevent dirty data if call does not complete