Misc updates

Pulling in some internal updates, primarily around setting custom data.  @asikora-sf Can you take a look and make sure I didn't miss anything in your custom data changes?