Seem to have fixed animation save
Fixed merge issue