Model - Master merge

Merged