Fix for reset causing animations to bail
Merge branch 'develop' into testing