Merge "Change visual animation code" into devel/master