Removed "prepare" method in Model
Merge remote-tracking branch 'origin/dev' into dev