Start update according with new Interacts implementation in Animals.
Merge remote-tracking branch 'origin/master'