Merge changes I6d1ebc72,Ic3565b09 into main

* changes:
  Modify how we identify empty SF objects.
  Add TransformToTimestamp tests.