LPS-50375 Fix transient fields, these should not carry any value during serialization
LPS-50375 - Avoid early returns