Squashed 'models/' changes from 95185ba..d172796

d172796 Edit shared
3236529 Merge commit '5d74e5922bf7dc701e2b0a0d64f23e1ea03f6dc9'
b139af0 Edit shared
b81ca4f Edit shared
9f7bdc0 Edit shared

git-subtree-dir: models
git-subtree-split: d1727962c3d49bdb4931c38dc59763a4f9494c37
Edit shared