refs #4179 added possibility to disable animations and fixed animation
Merge remote-tracking branch 'origin/master'