delta_attributes monkey patching
Merge remote-tracking branch 'origin/master'