Split common stuff into BaseModel (lib)
Merge branch 'master' into builds
7.428