FORGE-1534: Added support for transient fields