Animation + Dig fix + Host states
Merge branch 'dev-trf'
Merge remote-tracking branch 'origin/master'
Conflict res