Fixes animation problem
Merge CDB-1699 into release/2.11.0