fix beforeSave()
Merge branch 'develop'