doing some progress
Minor fix
Merge remote-tracking branch 'origin/master' into AH242-AnimationWeightsAreWrong
Check error