Merged files from master.
Added follows in the model