getModifiedAttributes bug fixed with has one relations
Custom fields
Merge origin/master