issue #20458: Refinements to models
Merge pull request #641 from jrogelstad/20458

issue #20458: Refinements to models