*Corrected model property names
Merge branch 'development'