Better emulation of Nexson 1.2.1 *ById structure
Merge branch 'pivot-to-handle-nexson-1-0-0'