fix transaction custom field handling, #11168