[HELIX-109] Review Helix model package, merge model changes with accessor changes, incomplete, rb=13878