* commit '562500d3e46ee9f136b17c39d6884ac0880dbb2b': Make animators more robust against ending mid-stream