Cherry pick and fix on branch from reference_types

Squash of the difference between account_cards and obj_render

For comparison (when reference_types is merged)